From: Julian Sparber <julian@sparber.net>
Date: Tue, 13 Feb 2024 18:40:07 +0000 (+0100)
Subject: messageTray: Rename bannerBodyText to body in Notification object
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~1^2~31
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=00c292733d2732c5748dd7007082ab918ac0961e;p=gnome-shell.git

messageTray: Rename bannerBodyText to body in Notification object

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3173>
---

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index d2c49fbb7..7e2be6558 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -767,7 +767,7 @@ export const Calendar = GObject.registerClass({
 export const NotificationMessage = GObject.registerClass(
 class NotificationMessage extends MessageList.Message {
     _init(notification) {
-        super._init(notification.source, notification.title, notification.bannerBodyText);
+        super._init(notification.source, notification.title, notification.body);
         this.setUseBodyMarkup(notification.bannerBodyMarkup);
 
         this.notification = notification;
@@ -804,7 +804,7 @@ class NotificationMessage extends MessageList.Message {
         this.datetime = n.datetime;
         this.setIcon(this._getIcon());
         this.setTitle(n.title);
-        this.setBody(n.bannerBodyText);
+        this.setBody(n.body);
         this.setUseBodyMarkup(n.bannerBodyMarkup);
     }
 
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index c0d7c4a73..023e56f4d 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -408,7 +408,7 @@ export const Notification = GObject.registerClass({
         this.isTransient = false;
         this.privacyScope = PrivacyScope.USER;
         this.forFeedback = false;
-        this.bannerBodyText = null;
+        this.body = null;
         this.bannerBodyMarkup = false;
         this.sound = null;
         this._soundPlayed = false;
@@ -441,7 +441,7 @@ export const Notification = GObject.registerClass({
         });
 
         this.title = title;
-        this.bannerBodyText = banner;
+        this.body = banner;
         this.bannerBodyMarkup = params.bannerMarkup;
 
         if (params.datetime)
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 29240a941..08f10da53 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -140,8 +140,8 @@ const NotificationsBox = GObject.registerClass({
                 continue;
 
             let body = '';
-            if (n.bannerBodyText) {
-                const bodyText = n.bannerBodyText.replace(/\n/g, ' ');
+            if (n.body) {
+                const bodyText = n.body.replace(/\n/g, ' ');
                 body = n.bannerBodyMarkup
                     ? bodyText
                     : GLib.markup_escape_text(bodyText, -1);